diff --git a/htaccess/.htaccess b/htaccess/.htaccess new file mode 100644 index 0000000..22c0eb2 --- /dev/null +++ b/htaccess/.htaccess @@ -0,0 +1,10 @@ + + RewriteEngine On + RewriteCond %{SERVER_PORT} !=443 + RewriteRule ^(.*)$ https://www.raffiskender.com/$1 [R=301,L] + RewriteBase / + RewriteRule ^index\.html$ - [L] + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule . /index.html [L] + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1cb0801..fddadc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/free-regular-svg-icons": "^6.4.0", + "@fortawesome/free-solid-svg-icons": "^6.4.0", "@fortawesome/vue-fontawesome": "^3.0.3", "axios": "^1.4.0", "core-js": "^3.8.3", @@ -1744,6 +1745,18 @@ "node": ">=6" } }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz", + "integrity": "sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.4.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/vue-fontawesome": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.3.tgz", diff --git a/package.json b/package.json index 93ba919..8cfded0 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/free-regular-svg-icons": "^6.4.0", + "@fortawesome/free-solid-svg-icons": "^6.4.0", "@fortawesome/vue-fontawesome": "^3.0.3", "axios": "^1.4.0", "core-js": "^3.8.3", diff --git a/public/icons8-info-16.png b/public/icons8-info-16.png deleted file mode 100644 index c208013..0000000 Binary files a/public/icons8-info-16.png and /dev/null differ diff --git a/public/image.ico b/public/image.ico new file mode 100644 index 0000000..874c411 Binary files /dev/null and b/public/image.ico differ diff --git a/public/index.html b/public/index.html index 9a71aa6..2bece10 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,7 @@ - + <%= htmlWebpackPlugin.options.title %> diff --git a/src/App.vue b/src/App.vue index cacfa72..631d783 100644 --- a/src/App.vue +++ b/src/App.vue @@ -42,21 +42,19 @@ const burger = useBurgerStore(); \ No newline at end of file diff --git a/src/components/Name.vue b/src/components/Name.vue index a0b22eb..c561406 100644 --- a/src/components/Name.vue +++ b/src/components/Name.vue @@ -38,7 +38,7 @@ const burger = useBurgerStore() diff --git a/src/components/Spinner.vue b/src/components/Spinner.vue new file mode 100644 index 0000000..7023191 --- /dev/null +++ b/src/components/Spinner.vue @@ -0,0 +1,55 @@ + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 2e86eb4..7445fdf 100644 --- a/src/main.js +++ b/src/main.js @@ -7,14 +7,13 @@ import { createPinia } from 'pinia' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' import { library } from '@fortawesome/fontawesome-svg-core' import { faCircleXmark } from '@fortawesome/free-regular-svg-icons' - -library.add( faCircleXmark ) +import { faLessThan, faGreaterThan } from '@fortawesome/free-solid-svg-icons' +library.add( faCircleXmark, faLessThan, faGreaterThan ) const pinia = createPinia() - createApp(App) .use(router) .use(pinia) diff --git a/src/router/index.js b/src/router/index.js index 5361ebc..21c750a 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,9 +1,5 @@ import { createRouter, createWebHistory } from 'vue-router' -const page = { - template:'
Je Sais Pas trop quoi
' -} - const routes = [ { @@ -11,16 +7,10 @@ const routes = [ name: 'home', component: () => import('@/views/Index.vue') }, - { - path: '/footer', - name: 'footer', - component: () => import('@/components/Footer.vue') - }, - { - path: '/whoAmI', - name: 'whoAmI', - component: () => import('@/views/WhoAmI.vue') + path: '/profile', + name: 'profile', + component: () => import('@/views/Profile.vue') }, { path: '/technologies', @@ -42,6 +32,11 @@ const routes = [ name: 'contact', component: () => import('@/views/Contact.vue') }, + { + path: '/:pathMatch(.*)', + name: '404', + component: () => import('@/views/404.vue') + }, ] diff --git a/src/stores/burger.js b/src/stores/burger.js index de82dbb..a336b91 100644 --- a/src/stores/burger.js +++ b/src/stores/burger.js @@ -18,7 +18,7 @@ export const useBurgerStore = defineStore('Burger', { //console.log("checked by toggle ? : " + this.checked) if (this.checked){ - router.push({name:'whoAmI'}) + router.push({name:'profile'}) } else { router.push({name:'home'}) diff --git a/src/stores/cards.js b/src/stores/cards.js deleted file mode 100644 index 8caa3da..0000000 --- a/src/stores/cards.js +++ /dev/null @@ -1,34 +0,0 @@ -import { defineStore } from 'pinia' - -export const useCardsStore = defineStore('Cards', { - state: () => ({ - card1: false, - card2: false, - card3: false, - card4: false, - }), - - actions: - { - reset(){ - this.card1 = false; - this.card2 = false; - this.card3 = false; - this.card4 = false; - - }, - toggleCard1(){ - this.card1 = true; - }, - toggleCard2(){ - this.card2 = true; - }, - toggleCard3(){ - this.card3 = true; - }, - toggleCard4(){ - this.card4 = true; - }, - - } -}) \ No newline at end of file diff --git a/src/stores/menu.js b/src/stores/menu.js deleted file mode 100644 index b92afd5..0000000 --- a/src/stores/menu.js +++ /dev/null @@ -1,25 +0,0 @@ -import { defineStore } from 'pinia' - -export const useMenuStore = defineStore('menu', { - state: () => ({ - whoAmI: true, - technologies: false, - projects: false, - networks: false, - contact: false, - }), - - actions: - { - selected(event){ - this.whoAmI = false - this.technologies = false - this.projects = false - this.networks = false - this.contact = false - - this[event.currentTarget.dataset.name] = true - - }, - } -}) \ No newline at end of file diff --git a/src/style/colors.scss b/src/style/colors.scss new file mode 100644 index 0000000..ae55132 --- /dev/null +++ b/src/style/colors.scss @@ -0,0 +1,21 @@ +$body-bg:hsl(0, 0%, 93%); +$page-bg:hsl(234, 20%, 30%); +//$page-bg1:hsl(0, 0%, 60%); + +$renforced-light : hsl(13, 68%, 60%); +$renforced-normal: hsl(13, 68%, 40%); +$renforced-dark : hsl(13, 68%, 20%); + +$hypertext-light : hsl(245, 100%, 87%); +$hypertext-normal : hsl(245, 100%, 82%); + +$main-normal: hsl(52, 50%, 90%); +$main-dark : hsl(52, 50%, 70%); + +$title-light : hsl(37, 79%, 90%); +$title-normal: hsl(37, 79%, 75%); +$title-dark : hsl(37, 79%, 60%); + +$action-light : hsl(139, 57%, 85%); +$action-normal: hsl(139, 57%, 77%); +$action-dark : hsl(139, 57%, 67%); \ No newline at end of file diff --git a/src/style/shared.scss b/src/style/shared.scss deleted file mode 100644 index 1860e61..0000000 --- a/src/style/shared.scss +++ /dev/null @@ -1,15 +0,0 @@ -$body-bg:rgb(206, 206, 206); -$page-bg:#3D405B; -$page-bg1:#999; - -$red:rgba(141, 0, 0, 1); -$red-light: #E07A5F; -$red-light-transparent: #e07b5fe9; -$white:#F4F1DE; -$green:#A5E6BA; -$page-title: #F2CC8F; - -$font-color:$white; - -$maxWidth: 1200px; -$imageWidth: 100%; \ No newline at end of file diff --git a/src/style/shared_old.scss b/src/style/shared_old.scss new file mode 100644 index 0000000..be4041e --- /dev/null +++ b/src/style/shared_old.scss @@ -0,0 +1,15 @@ +$body-bg:rgb(206, 206, 206); +$page-bg:#3D405B; +$page-bg1:#999; + +$renforced-normal:rgba(141, 0, 0, 1); +$renforced-light: #E07A5F; +$renforced-light-transparent: #e07b5fe9; +$main-normal:#F4F1DE; +$action-normal:#A5E6BA; +$title-normal: #F2CC8F; + +$font-color:$main-normal; + +$maxWidth: 1200px; +$imageWidth: 100%; \ No newline at end of file diff --git a/src/style/widths.scss b/src/style/widths.scss new file mode 100644 index 0000000..6447fe1 --- /dev/null +++ b/src/style/widths.scss @@ -0,0 +1,2 @@ +$maxWidth: 1200px; +$imageWidth: 100%; \ No newline at end of file diff --git a/src/views/404.vue b/src/views/404.vue new file mode 100644 index 0000000..b944cfb --- /dev/null +++ b/src/views/404.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file diff --git a/src/views/Contact.vue b/src/views/Contact.vue index bb1a364..2f30f96 100644 --- a/src/views/Contact.vue +++ b/src/views/Contact.vue @@ -3,6 +3,8 @@ import { useBurgerStore } from '@/stores/burger' import Modal from '@/components/Modal.vue'; import { ref, onMounted } from 'vue'; import { formService } from '@/services/form'; +import Spinner from '@/components/Spinner.vue'; + //import { badge } from 'fontawesome'; onMounted(() => { burger.check() @@ -28,7 +30,6 @@ const toggleModal = () => { modalActive.value = ! modalActive.value } const onSubmit = () => { - //document.getElementById("demo-form").submit(); // initializing forms erors : errors.value = { name : false, @@ -91,34 +92,34 @@ const onSubmit = () => {

contact

-

Please full up the form to keep in touch !

+

Please full up the form to keep in touch!

- Please enter your name + Please enter your name!
- Please enter some coordinates + Please enter some coordinates!
- Please enter your company + Please enter your company!
- Please write something + Please write something!

@@ -133,7 +134,8 @@ const onSubmit = () => { Send !

- Sending + + Sending...
@@ -146,15 +148,15 @@ const onSubmit = () => {
-

Merci !

-

Votre message a bien été envoyé !

+

Thank you !

+

Your message has been sent successfully!
\ No newline at end of file diff --git a/src/views/I_am copy.vue b/src/views/I_am copy.vue new file mode 100644 index 0000000..a450340 --- /dev/null +++ b/src/views/I_am copy.vue @@ -0,0 +1,72 @@ + + + + \ No newline at end of file diff --git a/src/views/Index.vue b/src/views/Index.vue index 3ef7085..b7f6907 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -45,7 +45,7 @@ onMounted(()=>{ \ No newline at end of file diff --git a/src/views/Projects.vue b/src/views/Projects.vue index f68a467..79438d2 100644 --- a/src/views/Projects.vue +++ b/src/views/Projects.vue @@ -1,28 +1,213 @@ + + \ No newline at end of file diff --git a/src/views/Projects1.vue b/src/views/Projects1.vue new file mode 100644 index 0000000..97f3891 --- /dev/null +++ b/src/views/Projects1.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/src/views/Technologies.vue b/src/views/Technologies.vue index 8f4f257..385af22 100644 --- a/src/views/Technologies.vue +++ b/src/views/Technologies.vue @@ -1,42 +1,54 @@ \ No newline at end of file diff --git a/src/views/WhoAmI.vue b/src/views/WhoAmI.vue deleted file mode 100644 index 75aac7d..0000000 --- a/src/views/WhoAmI.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - - \ No newline at end of file