Eliminados algunos archivos innecesarios, estructura cambiada para me…

…jorar legibilidad
juadecha · Mar 7, 2021 · 250b29e · 250b29e
1 parent a2123bf
commit 250b29e
Show file tree

Hide file tree

Showing 73 changed files with 54 additions and 5,728 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,46 +1,10 @@
 import NB from './containers/navbar'
-import Slidewrap from './Components/slidewrap'
+import Slideshow from './Components/slideshow'
 
 import Bottomwrap from './Components/bottomwrap'
 import Newsshow from './Components/newsshow'
 import JobComponent from './Components/jobComponent'
 import useWindowDimensions from './Components/setWindowDimensions'
-
-import './Inicio_files/simple-line-icons.css'
-import './Inicio_files/linea2.css'
-import './Inicio_files/scss/custom.scss'
-import './Inicio_files/bootstrap-responsive.css'
-import './Inicio_files/font-awesome.css';
-import './Inicio_files/favsocial.css';
-import './Inicio_files/icomoon.css';
-import './Inicio_files/vembed.css';
-import './Inicio_files/faveffects.css';
-import './Inicio_files/css.css';
-import './Inicio_files/favpromote.css';
-import './Inicio_files/style.css';
-import './Inicio_files/ic_rounded_module.css';
-import './Inicio_files/style.min.css';
-import './Inicio_files/style(1).css';
-import './Inicio_files/k2.css';
-
-
-import './Inicio_files/k2style.css';
-import './Inicio_files/joomla.css';
-import './Inicio_files/template.css';
-
-
-
-import './Inicio_files/etsii.css';
-
-import './Inicio_files/directorio.css';
-
-import './Inicio_files/checkbox.css';
-
-import './Inicio_files/calendar-blue.css';
-
-import './Inicio_files/balloon.css';
-
-import './Inicio_files/estilos.css'; 
 import Mainbottomwrap from './Components/mainbottomwrap';
 import Backtotop from './Components/backtotop';
 import Footerwrap from './Components/footerwrap';
@@ -50,6 +14,32 @@ import IGlobalState, { initialState} from './state/globalState'
 import { Provider } from 'react-redux'
 import { INavbarCollapseAction } from './actions/NavbarActions'
 
+//New SCSS import
+import './Inicio_files/scss/custom.scss'
+
+
+//Inhetired CSS import
+import './Inicio_files/inheritedCSS/linea2.css'
+import './Inicio_files/inheritedCSS/bootstrap-responsive.css'
+import './Inicio_files/inheritedCSS/font-awesome.css';
+import './Inicio_files/inheritedCSS/vembed.css';
+import './Inicio_files/inheritedCSS/faveffects.css';
+import './Inicio_files/inheritedCSS/css.css';
+import './Inicio_files/inheritedCSS/favpromote.css';
+import './Inicio_files/inheritedCSS/style.css';
+import './Inicio_files/inheritedCSS/style.min.css';
+import './Inicio_files/inheritedCSS/style(1).css';
+import './Inicio_files/inheritedCSS/k2.css';
+import './Inicio_files/inheritedCSS/k2style.css';
+import './Inicio_files/inheritedCSS/joomla.css';
+import './Inicio_files/inheritedCSS/template.css';
+import './Inicio_files/inheritedCSS/etsii.css';
+import './Inicio_files/inheritedCSS/directorio.css';
+import './Inicio_files/inheritedCSS/checkbox.css';
+import './Inicio_files/inheritedCSS/calendar-blue.css';
+import './Inicio_files/inheritedCSS/balloon.css';
+import './Inicio_files/inheritedCSS/estilos.css'; 
+
 <style type="text/css" dangerouslySetInnerHTML={{__html: "\n\n\t@media (min-width: 1200px) {\n\t\t.row-fluid { \n\t\t\tmax-width: 90%; \n\t\t}\n\t}\n\tbody { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-advertwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-slidewrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-introwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-showcasewrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-promowrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-topwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-maintopwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-mainbottomwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-bottomwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-userwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-footerwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-copyrightwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-debugwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t.slogan {\n\t\tfont-family: 'Helvetica Neue', Helvetica, sans-serif ;\n\t}\n\n" }} />		
 
 const reducer = (state: IGlobalState = initialState, action: Action) => {
@@ -82,7 +72,7 @@ function App() {
 
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
     <NB />
-    <Slidewrap />
+    <Slideshow />
     <Newsshow width={width}/>
     <JobComponent />
 
@@ -96,11 +86,8 @@ function App() {
 
     <Footerwrap />
 
-    {/* Copyright */}
     <Copyrightwrap />
-    {/* Debug */}
 
-    {/*[if lte IE 7]><![endif]*/}
     <noscript>&lt;strong&gt;JavaScript is currently disabled.&lt;/strong&gt;Please enable it for a better experience of &lt;a href="http://2glux.com/projects/jumi"&gt;Jumi&lt;/a&gt;.</noscript>
   </div>
   </Provider>

diff --git a/src/Components/advertwrap.tsx b/src/Components/advertwrap.tsx
diff --git a/src/Components/bottomwrap.tsx b/src/Components/bottomwrap.tsx
@@ -1,8 +1,8 @@
 import React from 'react'
-import footer1 from '../Inicio_files/cita-secretaria.png'
-import footer2 from '../Inicio_files/TFG.png'
-import footer3 from '../Inicio_files/etsiiorienta.png'
-import footer4 from '../Inicio_files/expon-us250A.png'
+import footer1 from '../Inicio_files/img/cita-secretaria.png'
+import footer2 from '../Inicio_files/img/TFG.png'
+import footer3 from '../Inicio_files/img/etsiiorienta.png'
+import footer4 from '../Inicio_files/img/expon-us250A.png'
 class Bottomwrap extends React.Component {
     public render () {
 

diff --git a/src/Components/footerwrap.tsx b/src/Components/footerwrap.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import footerLogo from '../Inicio_files/footerLogo.png'
+import footerLogo from '../Inicio_files/img/footerLogo.png'
 
 class Footerwrap extends React.Component {
     public render () {

diff --git a/src/Components/header.tsx b/src/Components/header.tsx
diff --git a/src/Components/introwrap.tsx b/src/Components/introwrap.tsx
diff --git a/src/Components/jobComponent.tsx b/src/Components/jobComponent.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import {Jumbotron, Button} from 'react-bootstrap'
-import imgJumbotron from '../Inicio_files/jumbotron.jpg'
+import imgJumbotron from '../Inicio_files/img/jumbotron.jpg'
 class JobComponent extends React.Component {
     public render () {
 

diff --git a/src/Components/linewrap.tsx b/src/Components/linewrap.tsx
diff --git a/src/Components/mainButton.tsx b/src/Components/mainButton.tsx
diff --git a/src/Components/navbar.tsx b/src/Components/navbar.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Navbar, Nav, Button } from 'react-bootstrap'
-import etsiilogo from '../Inicio_files/logotest.png'
+import etsiilogo from '../Inicio_files/img/logotest.png'
 
 interface INBProps {
 collapsed: boolean