Skip to content

Commit

Permalink
2022 changes + lang
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Graciov committed Jul 31, 2022
1 parent 9b90e13 commit bfb0998
Show file tree
Hide file tree
Showing 55 changed files with 348 additions and 207 deletions.
Binary file added public/assets/ro/landing/Bitmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/feature2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/features1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/features3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ro/landing/images9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/1010.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/3-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/33.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/44.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/55.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/6-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/ru/landing/6.png
Binary file added public/assets/ru/landing/66.jpg
Binary file added public/assets/ru/landing/7.png
Binary file added public/assets/ru/landing/77.jpg
Binary file added public/assets/ru/landing/8.png
Binary file added public/assets/ru/landing/9.png
Binary file added public/assets/ru/landing/99.jpg
Binary file added public/assets/ru/landing/Bitmap.png
Binary file added public/assets/ru/landing/IMG_20220728_120034.jpg
Binary file added public/assets/ru/landing/IMG_3712.jpg
Binary file added public/assets/ru/landing/IMG_3818.jpg
Binary file added public/assets/ru/landing/IMG_3822.jpg
Binary file added public/assets/ru/landing/Shape (1).png
Binary file added public/assets/ru/landing/Shape Copy.png
Binary file added public/assets/ru/landing/Shape.png
18 changes: 13 additions & 5 deletions src/Dashboard.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<template>
<section class="dashboard">
<div class="dashboard-text">
<h1>Dashboard</h1>
<h1 v-if="$route.params.lang === 'ro'">Dashboard</h1>
<h1 v-else> Доска объявлений</h1>
</div>

<button @click="newNote($event)" class="dashboard-button">NEW NOTE</button>
<button @click="newNote($event)" class="dashboard-button">{{ NewNoteText }}</button>
</section>

<section class="notes-container">
Expand All @@ -16,7 +17,7 @@
@click="goToNote(note.id)"
/>
</section>
</template>
</template>

<script>
import axios from "axios";
Expand All @@ -30,6 +31,11 @@ export default {
notes: []
};
},
computed: {
NewNoteText() {
return this.$route.params.lang === "ro" ? "Notita noua" : "новая запись";
}
},
async created() {
const userID = localStorage.getItem("USER_ID");
Expand All @@ -44,10 +50,10 @@ export default {
},
methods: {
newNote(event) {
this.$router.push("/newnote");
this.$router.push(`/${this.$route.params.lang}/newnote`);
},
goToNote(noteId) {
this.$router.push(`/notes/${noteId}`);
this.$router.push(`/${this.$route.params.lang}/notes/${noteId}`);
}
}
};
Expand Down Expand Up @@ -86,6 +92,7 @@ export default {
border: 0px;
cursor: pointer;
}
/* 1 rem = 16px */
.notes-container {
Expand All @@ -99,6 +106,7 @@ export default {
flex-direction: column;
align-items: center;
}
.dashboard-text h1 {
font-size: 40px;
}
Expand Down
100 changes: 52 additions & 48 deletions src/Landing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,88 +2,92 @@
<div class="container">
<section id="hero-id">
<div class="container-hero">
<h1>Let your contemplations slide</h1>
<p>
Be the person who makes everything become animated. Be other people’s
motivation for the every day life. Compose your own notes.
<h1 v-if="$route.params.lang === 'ro'">Urmărește complet scalabil</h1>
<h1 v-else> Следуйте прямо за расширением</h1>

<p v-if="$route.params.lang === 'ro'">
Utilizați cadrele agile pentru a oferi un rezumat solid pentru prezentări de ansamblu la nivel înalt.
</p>
<p v-else>Используйте гибкие интегрированные системы для обеспечения мощного краткого обзора для проведения
анализа на высоком уровне.</p>
</div>
</section>

<section class="about">
<h2>About Notes App</h2>
<h2 v-if="$route.params.lang === 'ro'">Despre aplicația Notițe </h2>
<h2 v-else> О приложении «Заметки»</h2>

<p>
Notes is the perfect app when you want to schedule your life. You can
keep count of your working out and sleep hours. You can track your
calories just by writing everything down by yourself. In that way your
lifestyle will be an organized and healthy one. Notes app may be the
motivation that you need when you want to make a change in your daily
routine.
<p v-if="$route.params.lang === 'ro'">Implementați în mod fosfluorescent metodologiile din întreaga lume cu tehnologie activată web. Coordonați
interactiv comerțul electronic proactiv prin gândire centrată pe proces. Urmăriți complet servicii scalabile
pentru clienți prin potențialități sustenabile</p>
<p v-else> Фосфлуоресцентно задействуйте мировые методологии с помощью веб-технологий. Интерактивно координируйте
опереждающую электронную коммерцию с помощью процессно-ориентированного мышления. Полностью реализуйте
масштабируемое обслуживание клиентов за счет устойчивых возможностей
</p>
</section>

<section id="feature-boxes" class="features">
<h2>Features</h2>
<p>
Notes is the perfect place to take advantage of the free time on your
hands. It can give you a myriad of new opportunities in order to feel
free with yourself. It may also remind you of forgotten moments you
sometimes had and it will constantly bring back alluring memories from
back in time.
<h2 v-if="$route.params.lang === 'ro'">Features</h2>
<h2 v-else>Особенности</h2>
<p v-if="$route.params.lang === 'ro'">
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsum error blanditiis debitis pariatur deserunt
sapiente eius repudiandae. Laboriosam doloribus unde officiis, consequatur expedita at sunt eligendi culpa
deserunt molestiae voluptas.
</p>
<p v-else>Человек в поисках комфортного, удобного, безопасного существования создает технические средства.</p>
<div class="feature-container">
<div class="feature-box">
<img
src="https://image.flaticon.com/icons/svg/2921/2921226.svg"
src="/assets/ro/landing/features1.png"
alt="create"
/>
<h3>Create Personalized Notes</h3>
<p>
Using Notes you can effortlessly personalize your items. In other
words, you are able to add photos, highlight or even add stickers to
everything you write.
<h3 v-if="$route.params.lang === 'ro'">Prima Caracteristica</h3>
<h3 v-else>Первая особенность</h3>
<p v-if="$route.params.lang === 'ro'">Imersiunea în nanotehnologie de-a lungul autostrăzii informaționale va închide bucla concentrându-se
doar pe linia de jos.</p>
<p v-else>Погружение в нанотехнологии вдоль информационной магистрали замкнет петлю
фокусирования исключительно на конечном результате.
</p>
</div>
<div class="feature-box">
<img
src="https://image.flaticon.com/icons/svg/2921/2921305.svg"
src="/assets/ro/landing/feature2.png"
alt="share"
/>
<h3>Share Notes</h3>
<p>
The written notes can be easily shared with everyone else. It also
allows them to give feedback and to react with emojis to your
thoughts.
</p>
<h3 v-if="$route.params.lang === 'ro'">A doua Caracteristica</h3>
<h3 v-else>Вторая особенность</h3>
<p v-if="$route.params.lang === 'ro'">Valorificați fructele care nu se potrivesc pentru a identifica o activitate cu valoare adăugată la
testul beta. Depășiți decalajul digital.</p>
<p v-else>Извлечение выгоды из легко-доступных материалов для определения приблизительно
добавленную стоимость бета-теста. Преодоление цифрового разрыва.</p>
</div>
<div class="feature-box">
<img
src="https://image.flaticon.com/icons/svg/2921/2921130.svg"
src="/assets/ro/landing/features3.png"
alt="delete"
/>
<h3>Fast Delete</h3>
<p>
One click and your notes can be deleted. This site offers the
possibility to erase everything faster than you thought. It is
uncomplicated to use and easy on hand.
</p>
<h3 v-if="$route.params.lang === 'ro'">Robotica</h3>
<h3 v-else>Робототехника</h3>
<p v-if="$route.params.lang === 'ro'"> Aduceți la masă strategii de supraviețuire câștig-câștig pentru a asigura dominația proactivă. La
sfârșitul zilei, mergi mai departe.</p>
<p v-else>Внесение беспроигрышного вклада в групповую работу для стратегии выживания и
обеспечения упреждающего доминирования. Итог- движение вперед.</p>
</div>
</div>
</section>

<section class="grid_container">
<img src="/assets/pics/summer1.jpg" alt="images1" />
<img src="/assets/pics/summer2.png" alt="images2" />
<img src="/assets/ro/landing/images1.png" alt="images1" />
<img src="/assets/ro/landing/images2.png" alt="images2" />

<img src="/assets/pics/summer3.png" alt="images3" />
<img src="/assets/pics/summer4.jpg" alt="images4" />
<img src="/assets/ro/landing/images3.png" alt="images3" />
<img src="/assets/ro/landing/images4.png" alt="images4" />

<img src="/assets/pics/summer5.jpg" alt="images5" />
<img src="/assets/pics/summer6.jpg" alt="images6" />
<img src="/assets/ro/landing/images5.png" alt="images5" />
<img src="/assets/ro/landing/images10.png" alt="images6" />

<img src="/assets/pics/summer7.jpg" alt="images7" />
<img src="/assets/pics/summer8.jpg" alt="images8" />
<img src="/assets/ro/landing/images7.png" alt="images7" />
<img src="/assets/ro/landing/images8.png" alt="images8" />
</section>

<section class="all-logos">
Expand Down Expand Up @@ -334,4 +338,4 @@ img {
grid-template-columns: 150px;
}
}
</style>
</style>
40 changes: 27 additions & 13 deletions src/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
type="text"
name="username"
id="username"
placeholder="Username"
:placeholder="Username"
required
v-model="input.username"
/>
Expand All @@ -19,22 +19,22 @@
type="password"
name="password"
id="password"
placeholder="Password"
:placeholder="Password"
required
v-model="input.password"
/>
<div class="buttons">
<button
@click.prevent="onloginButton($event)"
@click.prevent="onloginButton()"
class="register-button loginButton"
>
LOGIN
{{ LoginText }}
</button>
<button
@click.prevent="onregisterButton($event)"
class="register-button registerButton"
>
REGISTER
{{ RegisterText }}
</button>
</div>
</form>
Expand All @@ -57,9 +57,24 @@ export default {
}
};
},
created() {},
computed: {
Username() {
return this.$route.params.lang === "ro" ? "Nume de utilizator" : "Имя пользователя";
},
Password() {
return this.$route.params.lang === "ro" ? "Parola" : "Пароль";
},
LoginText() {
return this.$route.params.lang === "ro" ? "Logare" : "Вход";
},
RegisterText() {
return this.$route.params.lang === "ro" ? "Înregistrare" : "Регистрация";
}
},
created() {
},
methods: {
async onloginButton(event) {
async onloginButton() {
if (this.input.username !== "" && this.input.password !== "") {
const data = {
username: this.input.username,
Expand All @@ -68,7 +83,7 @@ export default {
try {
let response = await axios.post(
"https://notes-api.girlsgoit.org/users/login",
"https://notes-api.girlsgoit.org/login/",
data
);
Expand All @@ -77,7 +92,7 @@ export default {
localStorage.setItem("USER_NAME", this.input.username);
response = await axios.get(
"https://notes-api.girlsgoit.org/users/me"
"https://notes-api.girlsgoit.org/users/me/"
);
localStorage.setItem("USER_ID", response.data.id);
Expand All @@ -96,15 +111,14 @@ export default {
}
},
gotoDashboard(event) {
this.$router.push(`/Dashboard/`);
this.$router.push(`/${this.$route.params.lang}/dashboard/`);
},
onregisterButton(event) {
this.$router.push(`/Register/`);
this.$router.push(`/${this.$route.params.lang}/register/`);
}
}
};
</script>


<style scoped>
.login-page {
Expand Down Expand Up @@ -181,4 +195,4 @@ export default {
border: none;
color: #278df6;
}
</style>
</style>
5 changes: 3 additions & 2 deletions src/Note.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export default {
const response = await axios.get(
`https://notes-api.girlsgoit.org/notes/${this.noteId}/`
);
console.log(response);
this.noteElements = response.data.note_elements;
}
Expand All @@ -84,7 +85,7 @@ export default {
`https://notes-api.girlsgoit.org/notes/${this.noteId}/`
);
this.$router.push("/dashboard");
this.$router.push(`/${this.$route.params.lang}/dashboard`);
}
}
};
Expand All @@ -105,4 +106,4 @@ export default {
font-style: normal;
font-weight: normal;
}
</style>
</style>
Loading

0 comments on commit bfb0998

Please sign in to comment.