Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Commit

Permalink
fix: terms
Browse files Browse the repository at this point in the history
  • Loading branch information
eddiejaoude committed Aug 25, 2023
2 parents 9d9729f + 20d23e3 commit 5aa15a3
Show file tree
Hide file tree
Showing 17 changed files with 278 additions and 153 deletions.
20 changes: 10 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
## [1.178.8](https:/EddieHubCommunity/BioDrop/compare/v1.178.7...v1.178.8) (2023-08-23)
## [1.178.9](https:/EddieHubCommunity/LinkFree/compare/v1.178.8...v1.178.9) (2023-08-25)


### Bug Fixes

* docs side nav for mobiles ([#8177](https:/EddieHubCommunity/BioDrop/issues/8177)) ([3ab0b01](https:/EddieHubCommunity/BioDrop/commit/3ab0b01ab9db601059bcef47bb5feebf9eca9237))
* event speaker status and speaker title ([#8006](https:/EddieHubCommunity/LinkFree/issues/8006)) ([56203b7](https:/EddieHubCommunity/LinkFree/commit/56203b71d5224bbf1b2a6f6d919513c4d8726de1))



## [1.178.7](https:/EddieHubCommunity/BioDrop/compare/v1.178.6...v1.178.7) (2023-08-22)
## [1.178.8](https:/EddieHubCommunity/LinkFree/compare/v1.178.7...v1.178.8) (2023-08-23)


### Bug Fixes

* community resources to config array ([#8577](https:/EddieHubCommunity/BioDrop/issues/8577)) ([ae545e8](https:/EddieHubCommunity/BioDrop/commit/ae545e8a58a2547656a6cd2c029232e9d9e4f0f1))
* docs side nav for mobiles ([#8177](https:/EddieHubCommunity/LinkFree/issues/8177)) ([3ab0b01](https:/EddieHubCommunity/LinkFree/commit/3ab0b01ab9db601059bcef47bb5feebf9eca9237))



## [1.178.6](https:/EddieHubCommunity/BioDrop/compare/v1.178.5...v1.178.6) (2023-08-22)
## [1.178.7](https:/EddieHubCommunity/LinkFree/compare/v1.178.6...v1.178.7) (2023-08-22)


### Bug Fixes

* spacing between add repo form and repo list ([#8694](https:/EddieHubCommunity/BioDrop/issues/8694)) ([9cc0624](https:/EddieHubCommunity/BioDrop/commit/9cc0624c3a2bed5ebadd6e4bbdce4864f210678f))
* community resources to config array ([#8577](https:/EddieHubCommunity/LinkFree/issues/8577)) ([ae545e8](https:/EddieHubCommunity/LinkFree/commit/ae545e8a58a2547656a6cd2c029232e9d9e4f0f1))



## [1.178.5](https:/EddieHubCommunity/BioDrop/compare/v1.178.4...v1.178.5) (2023-08-22)
## [1.178.6](https:/EddieHubCommunity/LinkFree/compare/v1.178.5...v1.178.6) (2023-08-22)


### Bug Fixes

* notification removed after set time ([#8607](https:/EddieHubCommunity/BioDrop/issues/8607)) ([a74cd9e](https:/EddieHubCommunity/BioDrop/commit/a74cd9e95fede2e554344575b6572b93b218b4a8))
* spacing between add repo form and repo list ([#8694](https:/EddieHubCommunity/LinkFree/issues/8694)) ([9cc0624](https:/EddieHubCommunity/LinkFree/commit/9cc0624c3a2bed5ebadd6e4bbdce4864f210678f))



## [1.178.4](https:/EddieHubCommunity/BioDrop/compare/v1.178.3...v1.178.4) (2023-08-22)
## [1.178.5](https:/EddieHubCommunity/LinkFree/compare/v1.178.4...v1.178.5) (2023-08-22)


### Bug Fixes

* missing items now have a space between ([#8676](https:/EddieHubCommunity/BioDrop/issues/8676)) ([6c83c18](https:/EddieHubCommunity/BioDrop/commit/6c83c1898be55055376157c00eea972a55f47430))
* notification removed after set time ([#8607](https:/EddieHubCommunity/LinkFree/issues/8607)) ([a74cd9e](https:/EddieHubCommunity/LinkFree/commit/a74cd9e95fede2e554344575b6572b93b218b4a8))



2 changes: 1 addition & 1 deletion components/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default function Footer() {
href: BASE_GITHUB_PROJECT_URL + "/blob/main/LICENSE",
external: true,
},
{ name: "Terms", href: "/terms", external: false },
{ name: "Terms", href: "/docs/terms", external: false },
],
social: [
{
Expand Down
7 changes: 3 additions & 4 deletions components/event/EventCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,10 @@ export default function EventCard({ manage, event, usernames }) {
</Link>
)}
</div>
{event.userStatus && (
{event.isSpeaking && (
<div className="text-primary-medium-low dark:text-primary-low-medium italic hidden lg:block">
{event.userStatus}
{event.userStatus == "speaking" && " at "} this event
{event.userStatus == "speaking" && event?.speakingTopic && (
{"Speaking at "} this event
{event?.speakingTopic && (
<>
{" "}
on <b>{event.speakingTopic}</b>
Expand Down
2 changes: 1 addition & 1 deletion config/app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.178.8",
"version": "1.178.9",
"alerts": [],
"layouts": [
"classic",
Expand Down
9 changes: 5 additions & 4 deletions data/BSatishSutar.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
"Blogging"
],
"socials": [
{
"icon": "FaTwitter",
"url": "https://twitter.com/SGSMaven"
},
{
"icon": "FaGithub",
"url": "https:/BSatishSutar"
Expand Down Expand Up @@ -42,6 +38,11 @@
"url": "https:/BSatishSutar",
"icon": "FaGithub"
},
{
"name": "Portfolio",
"url": "https://bsatishsutar.github.io/",
"icon": "FaGithub"
},
{
"name": "GitLab",
"url": "https://gitlab.com/SatishSutar",
Expand Down
85 changes: 0 additions & 85 deletions data/Dun-sin.json

This file was deleted.

21 changes: 21 additions & 0 deletions data/MaorBemdoo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "Bemdoo Maor",
"bio": "15 year old passionate Full-stack developer | Student | Open source lover",
"links": [
{
"name": "Follow me on Github",
"url": "https://twitter.com/MaorBemdoo",
"icon": "FaGithub"
},
{
"name": "Follow me on Twitter",
"url": "https://twitter.com/BemdooMaor",
"icon": "FaTwitter"
},
{
"name": "Follow me on Linkedin",
"url": "https://www.linkedin.com/in/bemdoo-maor-449698279",
"icon": "FaLinkedin"
}
]
}
2 changes: 1 addition & 1 deletion data/Myrausman.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{
"group": "Primary Socials",
"name": "Twitter: Follow me",
"url": "https://twitter.com/Myra_5703",
"url": "https://twitter.com/Myra_5703",
"icon": "FaTwitter"
},
{
Expand Down
16 changes: 16 additions & 0 deletions data/SohaMubashir.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "Soha Mubashir",
"bio": "Web Developer | Python and JavaScript enthusiast | Open Source",
"links": [
{
"name": "Follow on GitHub",
"url": "https:/SohaMubashir",
"icon": "FaGithub"
},
{
"name": "Follow on Linkedin",
"url": "https://www.linkedin.com/in/soha-mubashir-196r",
"icon": "FaLinkedin"
}
]
}
2 changes: 1 addition & 1 deletion data/grand-rick001.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{
"group": "Socials",
"name": "Twitter: Let's converse",
"url": "https://twitter.com/grandrick001",
"url": "https://twitter.com/patrick_murimi_",
"icon": "FaTwitter",
"color": "#00ACEE"
},
Expand Down
5 changes: 5 additions & 0 deletions models/Profile/Event.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ const EventSchema = new Schema({
price: {
startingFrom: Number,
},
isSpeaking: Boolean,
speakingTopic: {
type: String,
max: 256,
},
color: {
type: String,
min: 2,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "biodrop",
"version": "1.178.8",
"version": "1.178.9",
"private": false,
"homepage": "https://biodrop.io",
"engines": {
Expand Down
38 changes: 38 additions & 0 deletions pages/account/manage/event/[[...data]].js
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,20 @@ export default function ManageEvent({ BASE_URL, event }) {
additionalMessage: "",
});
const [isVirtual, setIsVirtual] = useState(event.isVirtual ? true : false);
const [isSpeaking, setIsSpeaking] = useState(event.isSpeaking ? true : false);
const [name, setName] = useState(event.name || "");
const [description, setDescription] = useState(event.description || "");
const [url, setUrl] = useState(event.url || "");
const [startDate, setStartDate] = useState("");
const [endDate, setEndDate] = useState("");
const [speakingTopic, setspeakingTopic] = useState(event.speakingTopic || "");

useEffect(() => {
if (!isSpeaking) {
setspeakingTopic("");
}
}, [isSpeaking]);

const [price, setPrice] = useState(event.price?.startingFrom || 0);
const [color, setColor] = useState(event.color || "");

Expand Down Expand Up @@ -111,6 +120,8 @@ export default function ManageEvent({ BASE_URL, event }) {
date: { start: submitDate(startDate), end: submitDate(endDate) },
isVirtual,
price: { startingFrom: price },
isSpeaking,
speakingTopic,
color,
};
let apiUrl = `${BASE_URL}/api/account/manage/event/`;
Expand Down Expand Up @@ -218,6 +229,7 @@ export default function ManageEvent({ BASE_URL, event }) {
<div className="mt-1 sm:col-span-2 sm:mt-0">
<Textarea
name="description"
label="Description"
onChange={(e) => setDescription(e.target.value)}
value={description}
placeholder="Description of the event from their website"
Expand Down Expand Up @@ -264,6 +276,30 @@ export default function ManageEvent({ BASE_URL, event }) {
For example: In <i>DD / MM / YYYY, HH:MM</i>
</p>
</div>
<div className="mt-1 sm:col-span-2 sm:mt-0">
<Toggle
text1="Are you speaking?"
enabled={isSpeaking}
setEnabled={setIsSpeaking}
/>
</div>
{isSpeaking && (
<div className="mt-1 sm:col-span-2 sm:mt-0">
<Input
type="text"
name="topic"
label="What topic are you speaking on ?"
placeholder="Your speaking topic"
onChange={(e) => setspeakingTopic(e.target.value)}
value={speakingTopic}
required
maxLength="256"
/>
<p className="text-sm text-primary-low-medium">
For example: <i>The future of AI</i>
</p>
</div>
)}
<div className="mt-1 sm:col-span-2 sm:mt-0">
<Input
type="number"
Expand Down Expand Up @@ -318,6 +354,8 @@ export default function ManageEvent({ BASE_URL, event }) {
url,
date: { start: startDate, end: endDate },
isVirtual,
isSpeaking,
speakingTopic,
price: { startingFrom: price },
color,
}}
Expand Down
2 changes: 2 additions & 0 deletions pages/api/system/reload.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ export default async function handler(req, res) {
end: event.date.end,
},
url: event.url,
isSpeaking: event.userStatus && event.userStatus.toLowerCase() == "speaking",
speakingTopic: event.speakingTopic,
price: event.price,
})),
}
Expand Down
Loading

0 comments on commit 5aa15a3

Please sign in to comment.