diff --git a/frontend/src/Assets/3_TwoNumOrdered_comma.csv b/frontend/Resources/Assets/3_TwoNumOrdered_comma.csv similarity index 100% rename from frontend/src/Assets/3_TwoNumOrdered_comma.csv rename to frontend/Resources/Assets/3_TwoNumOrdered_comma.csv diff --git a/frontend/src/Assets/background3.jpg b/frontend/Resources/Assets/background3.jpg similarity index 100% rename from frontend/src/Assets/background3.jpg rename to frontend/Resources/Assets/background3.jpg diff --git a/frontend/src/Assets/pxapi-api_table_C1EUvalNom.json b/frontend/Resources/Assets/pxapi-api_table_C1EUvalNom.json similarity index 94% rename from frontend/src/Assets/pxapi-api_table_C1EUvalNom.json rename to frontend/Resources/Assets/pxapi-api_table_C1EUvalNom.json index 61f34c3eb5b3270380832ece4a4e91160e5e801a..0a0e9443caaa27bcc40144fb66517378cb4d473f 100644 --- a/frontend/src/Assets/pxapi-api_table_C1EUvalNom.json +++ b/frontend/Resources/Assets/pxapi-api_table_C1EUvalNom.json @@ -1,34 +1,34 @@ -{"queryObj":{ - "query": [ - { - "code": "Kon", - "selection": { - "filter": "item", - "values": [ - "1+2" - ] - } - }, - { - "code": "ContentsCode", - "selection": { - "filter": "item", - "values": [ - "ME0116P0" - ] - } - }, - { - "code": "Tid", - "selection": { - "filter": "item", - "values": [ - "2019" - ] - } - } - ], - "response": { - "format": "px" - } +{"queryObj":{ + "query": [ + { + "code": "Kon", + "selection": { + "filter": "item", + "values": [ + "1+2" + ] + } + }, + { + "code": "ContentsCode", + "selection": { + "filter": "item", + "values": [ + "ME0116P0" + ] + } + }, + { + "code": "Tid", + "selection": { + "filter": "item", + "values": [ + "2019" + ] + } + } + ], + "response": { + "format": "px" + } },"tableIdForQuery":"C1EUvalNom"} \ No newline at end of file diff --git a/frontend/src/Assets/sweden-with-regions_.geojson b/frontend/Resources/Assets/sweden-with-regions_.geojson similarity index 100% rename from frontend/src/Assets/sweden-with-regions_.geojson rename to frontend/Resources/Assets/sweden-with-regions_.geojson diff --git a/frontend/src/Assets/swedish_provinces.geojson b/frontend/Resources/Assets/swedish_provinces.geojson similarity index 100% rename from frontend/src/Assets/swedish_provinces.geojson rename to frontend/Resources/Assets/swedish_provinces.geojson diff --git a/frontend/src/Assets/swedish_regions.geojson b/frontend/Resources/Assets/swedish_regions.geojson similarity index 100% rename from frontend/src/Assets/swedish_regions.geojson rename to frontend/Resources/Assets/swedish_regions.geojson diff --git a/frontend/src/Assets/swedish_regions2.geojson b/frontend/Resources/Assets/swedish_regions2.geojson similarity index 100% rename from frontend/src/Assets/swedish_regions2.geojson rename to frontend/Resources/Assets/swedish_regions2.geojson diff --git a/frontend/src/Assets/tictactoe.html b/frontend/Resources/Assets/tictactoe.html similarity index 100% rename from frontend/src/Assets/tictactoe.html rename to frontend/Resources/Assets/tictactoe.html diff --git a/frontend/src/Components/Navbar/Navbar.js b/frontend/Resources/Components/Navbar/Navbar.js similarity index 83% rename from frontend/src/Components/Navbar/Navbar.js rename to frontend/Resources/Components/Navbar/Navbar.js index 573857e881cb4c82e0290d33b099d69270b35acb..64f838ac51a436bde322115723faf74c4af48610 100644 --- a/frontend/src/Components/Navbar/Navbar.js +++ b/frontend/Resources/Components/Navbar/Navbar.js @@ -1,5 +1,5 @@ import React from 'react'; -import './Navbar.css' +import '../../css/Navbar.css' function TopNavBar() { return ( diff --git a/frontend/src/Pages/Dashboard/Barchart.jsx b/frontend/Resources/Pages/Dashboard/Barchart.jsx similarity index 100% rename from frontend/src/Pages/Dashboard/Barchart.jsx rename to frontend/Resources/Pages/Dashboard/Barchart.jsx diff --git a/frontend/src/Pages/Dashboard/Dashboard.jsx b/frontend/Resources/Pages/Dashboard/Dashboard.jsx similarity index 94% rename from frontend/src/Pages/Dashboard/Dashboard.jsx rename to frontend/Resources/Pages/Dashboard/Dashboard.jsx index 5072570beadc93c8a320fca1ff82b6f320732e2a..cfb4bd260e0b5606b41a18a3c403207787e034cb 100644 --- a/frontend/src/Pages/Dashboard/Dashboard.jsx +++ b/frontend/Resources/Pages/Dashboard/Dashboard.jsx @@ -1,4 +1,4 @@ -import './Dashboard.css' +import '../../css/Dashboard.css' import React, {useState} from 'react' import Map from './Map'; diff --git a/frontend/src/Pages/Dashboard/Map.jsx b/frontend/Resources/Pages/Dashboard/Map.jsx similarity index 99% rename from frontend/src/Pages/Dashboard/Map.jsx rename to frontend/Resources/Pages/Dashboard/Map.jsx index 33791dd2167f53dbb5867521cf6f1b1e876185aa..d7bf20c6a4e9eafb1d9e72b6047cd3611fc783c2 100644 --- a/frontend/src/Pages/Dashboard/Map.jsx +++ b/frontend/Resources/Pages/Dashboard/Map.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import './Map.css' +import '../../css/Map.css' import * as d3 from "d3"; //import geojson from './swedish_provinces.geojson'; // Import the GeoJSON file diff --git a/frontend/src/Pages/Dashboard/Visualiser.jsx b/frontend/Resources/Pages/Dashboard/Visualiser.jsx similarity index 93% rename from frontend/src/Pages/Dashboard/Visualiser.jsx rename to frontend/Resources/Pages/Dashboard/Visualiser.jsx index 326fbd243041c352689b90d6e972199e555424c5..ef01fbf9131590328a20bfdd6e8cbb9210c6e41c 100644 --- a/frontend/src/Pages/Dashboard/Visualiser.jsx +++ b/frontend/Resources/Pages/Dashboard/Visualiser.jsx @@ -1,5 +1,5 @@ import React from 'react' -import './Visualiser.css' +import '../../css/Visualiser.css' //import Graph from './Graph'; //import { Barplot } from './Barplot'; diff --git a/frontend/src/Pages/SignupSigninForms/Form.js b/frontend/Resources/Pages/SignupSigninForms/Form.js similarity index 95% rename from frontend/src/Pages/SignupSigninForms/Form.js rename to frontend/Resources/Pages/SignupSigninForms/Form.js index b111892268109ee1b418ba7fc0042ccce43826b6..2fffe705727ad6590b8c4ac48f532c879f6ab25e 100644 --- a/frontend/src/Pages/SignupSigninForms/Form.js +++ b/frontend/Resources/Pages/SignupSigninForms/Form.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { Routes, Route } from "react-router-dom"; -import './Form.css'; +import '../../css/Form.css'; import { SignInForm } from './SignInForm'; import { SignUpForm } from './SignUpForm'; diff --git a/frontend/src/Pages/SignupSigninForms/SignInForm.jsx b/frontend/Resources/Pages/SignupSigninForms/SignInForm.jsx similarity index 98% rename from frontend/src/Pages/SignupSigninForms/SignInForm.jsx rename to frontend/Resources/Pages/SignupSigninForms/SignInForm.jsx index 39885739e8472e6f661eff046617ffe39da536c5..f35e5e98f36608601ccf9fbc7090af6cd0d06cb3 100644 --- a/frontend/src/Pages/SignupSigninForms/SignInForm.jsx +++ b/frontend/Resources/Pages/SignupSigninForms/SignInForm.jsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import './SignForm.css'; +import '../../css/SignForm.css'; //React-icons imports import { FaUser } from "react-icons/fa"; import { FaLock } from "react-icons/fa"; diff --git a/frontend/src/Pages/SignupSigninForms/SignUpForm.jsx b/frontend/Resources/Pages/SignupSigninForms/SignUpForm.jsx similarity index 98% rename from frontend/src/Pages/SignupSigninForms/SignUpForm.jsx rename to frontend/Resources/Pages/SignupSigninForms/SignUpForm.jsx index 9e7cca514119fa17b6dba20ce16473bf694c8a5e..ca4f605ba16c96a84721668508b93aeeaa325eb2 100644 --- a/frontend/src/Pages/SignupSigninForms/SignUpForm.jsx +++ b/frontend/Resources/Pages/SignupSigninForms/SignUpForm.jsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import './SignForm.css'; +import '../../css/SignForm.css'; //React-icons imports import { MdEmail } from "react-icons/md"; import { FaUser } from "react-icons/fa"; diff --git a/frontend/src/Pages/Dashboard/Dashboard.css b/frontend/Resources/css/Dashboard.css similarity index 100% rename from frontend/src/Pages/Dashboard/Dashboard.css rename to frontend/Resources/css/Dashboard.css diff --git a/frontend/src/Pages/SignupSigninForms/Form.css b/frontend/Resources/css/Form.css similarity index 100% rename from frontend/src/Pages/SignupSigninForms/Form.css rename to frontend/Resources/css/Form.css diff --git a/frontend/src/Pages/Dashboard/Map.css b/frontend/Resources/css/Map.css similarity index 100% rename from frontend/src/Pages/Dashboard/Map.css rename to frontend/Resources/css/Map.css diff --git a/frontend/src/Components/Navbar/Navbar.css b/frontend/Resources/css/Navbar.css similarity index 100% rename from frontend/src/Components/Navbar/Navbar.css rename to frontend/Resources/css/Navbar.css diff --git a/frontend/src/Pages/SignupSigninForms/SignForm.css b/frontend/Resources/css/SignForm.css similarity index 100% rename from frontend/src/Pages/SignupSigninForms/SignForm.css rename to frontend/Resources/css/SignForm.css diff --git a/frontend/src/Pages/Dashboard/Visualiser.css b/frontend/Resources/css/Visualiser.css similarity index 100% rename from frontend/src/Pages/Dashboard/Visualiser.css rename to frontend/Resources/css/Visualiser.css diff --git a/frontend/src/index.css b/frontend/Resources/css/index.css similarity index 100% rename from frontend/src/index.css rename to frontend/Resources/css/index.css diff --git a/frontend/src/index.js b/frontend/Resources/index.js similarity index 94% rename from frontend/src/index.js rename to frontend/Resources/index.js index 5a9734046d9d013e718e262f24d72906172cac83..98dceef723be9f96b07c2a9a18b98125100d66a1 100644 --- a/frontend/src/index.js +++ b/frontend/Resources/index.js @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import { BrowserRouter } from "react-router-dom"; -import './index.css'; +import './css/index.css'; import Form from './Pages/SignupSigninForms/Form'; import { Dashboard } from './Pages/Dashboard/Dashboard';