Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Charlie 54 #90

Open
wants to merge 22 commits into
base: CHARLIE-67
Choose a base branch
from
Open

Charlie 54 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8d66c17
Kreiran novi branch, dodane rute u zajednički App.js
dsabovic1 Apr 20, 2019
5b2a61c
Isprevljene rute za grupe na početnoj stranici
dsabovic1 Apr 20, 2019
120ca0a
Dodan link na Chat unutar navigacijskog bara
dsabovic1 Apr 20, 2019
2eb1166
Izmjene Header.js -različit header za različite stranice
dsabovic1 Apr 20, 2019
f7f3371
Urađena zamjena headera za početnu stranicu i stranicu predmeta
dsabovic1 Apr 20, 2019
7737f61
Finalne prepravke
dsabovic1 Apr 20, 2019
74d28ea
Dodan href za link chat
dsabovic1 Apr 20, 2019
955101c
Merge branch 'develop' into FOX_US35
ntarakcija Apr 21, 2019
a944742
Merge pull request #78 from si-2019/FOX_US35
ntarakcija Apr 21, 2019
f7f317b
Merge branch 'develop' into FOX_US58
ntarakcija Apr 21, 2019
1f6f04c
Merge pull request #79 from si-2019/FOX_US58
ntarakcija Apr 21, 2019
c5e7cae
Revert "Dodan href za link chat"
ntarakcija Apr 21, 2019
7dfb887
Merge pull request #80 from si-2019/revert-79-FOX_US58
ntarakcija Apr 21, 2019
ad7b039
Ispravljena greska
dsabovic1 Apr 21, 2019
df8bfc2
Merge branch 'develop' into FOX_US58
dsabovic1 Apr 21, 2019
b60d4d8
Merge pull request #81 from si-2019/FOX_US58
ntarakcija Apr 21, 2019
6cc3576
Dodan link za zadaće i dodan package-lock fajl u gitignore
ntarakcija Apr 21, 2019
e8248b8
Dodan link za zadaću i dodan package-lock fajl u gitignore
ntarakcija Apr 21, 2019
1d064df
Dodan href za link zadaće
ntarakcija Apr 21, 2019
2cee21c
Merge pull request #83 from si-2019/Fox_US26
dsabovic1 Apr 21, 2019
3389112
Merge pull request #84 from si-2019/Fox_US47
dsabovic1 Apr 21, 2019
e0e461a
User story 54
nezlabisevac Apr 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions reactapp/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
.package-lock.json

# testing
/coverage
Expand Down
8,420 changes: 4,228 additions & 4,192 deletions reactapp/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion reactapp/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Charlie from './CHARLIE/app.js'
import Delta from './DELTA/app.js'
import Echo from './ECHO/app.js'
import Fox from './FOX/app.js'
import StranicaPredmeta from './FOX/StranicaPredmeta';
import Golf from './GOLF/app.js'
import Hotel from './HOTEL/app.js'
import India from './INDIA/app.js'
Expand Down Expand Up @@ -37,7 +38,8 @@ class App extends Component {
<Route path="/charlie" component={Charlie} />
<Route path="/delta" component={Delta} />
<Route path="/echo" component={Echo} />
<Route path="/fox" component={Fox} />
<Route exact path="/fox" component={Fox} />
<Route path="/fox/StranicaPredmeta" component={StranicaPredmeta} />
<Route path="/golf" component={Golf} />
<Route path="/hotel" component={Hotel} />
<Route path="/india" component={India} />
Expand Down
25 changes: 17 additions & 8 deletions reactapp/src/FOX/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,26 @@ import Navbar001 from './Navbar001';


class Header extends Component {
constructor(props) {
super(props);
{/*Promijeni na true za header početne stranice, false za header stranice predmeta */}
this.state = {isPocetna: props.isPocetna}
}
render() {
const isPocetna = this.state.isPocetna;
let meni;
if (isPocetna) {
meni = <div>
<Navbar.Brand href="#home">ETF</Navbar.Brand>
<a style={{color: 'white'}}class="" onclick="" href="https://www.iiicareer.com/OTS/Client/logout.php">Odjava</a>
<a style={{color: 'white'}}class="" onclick="" href="http://yiiisu.com/load.php?action=download&id=3" >Uputstvo</a>
</div>
}
else {meni = <Navbar001 />;}
return (
<div className="Header">
<Navbar bg="dark" variant="dark">
<Navbar.Brand href="#home">ETF</Navbar.Brand>
<Navbar001 />

<a style={{color: 'white'}}class="" onclick="" href="https://www.iiicareer.com/OTS/Client/logout.php">Odjava</a>

<a style={{color: 'white'}}class="" onclick="" href="http://yiiisu.com/load.php?action=download&id=3" >Uputstvo</a>

<Navbar bg="dark" variant="dark">
{meni}
</Navbar>

</div>
Expand Down
5 changes: 2 additions & 3 deletions reactapp/src/FOX/Navbar001.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ class Navbar001 extends Component {
<Nav.Link href="unos_podataka">Unos podataka</Nav.Link>
<Nav.Link href="ispiti">Ispiti</Nav.Link>
<Nav.Link href="obavijesti">Obavijesti</Nav.Link>
<Nav.Link href="zadace">Zadace</Nav.Link>
<Nav.Link href="ankete">Ankete</Nav.Link>
<Nav.Link href="statistika">Statistika</Nav.Link>
<Nav.Link href="chat">Chat</Nav.Link>
<Nav.Link href="forum">Forum</Nav.Link>
<Nav.Link href="materijali">Materijali</Nav.Link>
<Nav.Link href="ispit">Ispit</Nav.Link>*/}
<Nav.Link href="zadace">Zadace</Nav.Link>
<Nav.Link >Raspored</Nav.Link>

<Nav.Link href="chat">Chat</Nav.Link>
</Nav>
);
}
Expand Down
25 changes: 9 additions & 16 deletions reactapp/src/FOX/Predmet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,31 @@ class Predmet extends Component {
<div>

<Nav className="mr-auto">
<Nav.Link href="predmet"> <h3>PREDMET</h3></Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"> <h3>PREDMET</h3></Nav.Link>
</Nav>
</div>
<div>
<ul>
<li>Grupa1</li>
<ul>
<Nav className="mr-auto">
<Nav.Link href="predmet">Grupa1</Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"><li>Grupa1</li></Nav.Link>
</Nav>
<li>Grupa2</li>
<Nav className="mr-auto">
<Nav.Link href="predmet">Grupa2</Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"><li>Grupa2</li></Nav.Link>
</Nav>
<li>Grupa3</li>
<Nav className="mr-auto">
<Nav.Link href="predmet">Grupa3</Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"><li>Grupa3</li></Nav.Link>
</Nav>
<li>Grupa4</li>
<Nav className="mr-auto">
<Nav.Link href="predmet">Grupa4</Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"><li>Grupa4</li></Nav.Link>
</Nav>
<li>Grupa5</li>
<Nav className="mr-auto">
<Nav.Link href="predmet">Grupa5</Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"><li>Grupa5</li></Nav.Link>
</Nav>
<li>Grupa6</li>
<Nav className="mr-auto">
<Nav.Link href="predmet">Grupa6</Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"><li>Grupa6</li></Nav.Link>
</Nav>
<li>Grupa7</li>a
<Nav className="mr-auto">
<Nav.Link href="predmet">Grupa7</Nav.Link>
<Nav.Link href="fox/StranicaPredmeta"><li>Grupa7</li></Nav.Link>
</Nav>

</ul>
Expand Down
2 changes: 1 addition & 1 deletion reactapp/src/FOX/ReturnButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class ReturnButton extends Component {
)
}
return (
<Nav.Link href="/">Nazad na početnu</Nav.Link>
<Nav.Link href="/fox">Nazad na početnu</Nav.Link>
)
}
}
Expand Down
3 changes: 1 addition & 2 deletions reactapp/src/FOX/StranicaPredmeta.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ class StranicaPredmeta extends Component {
render() {
return (
<div className="StranicaPredmeta">
<Header/>
<Header isPocetna={false}/>
<br></br>
<h1>Stranica predmeta</h1>
<br></br>
<Navbar001/>
<TabelaStudenti/>
<Footer/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion reactapp/src/FOX/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class App extends Component {
render() {
return (
<div className="App">
<Header/>
<Header isPocetna={true}/>
<h1>Početna stranica</h1>
<DanDatum/>
<Predmet/>
Expand Down
4 changes: 2 additions & 2 deletions reactapp/src/FOX/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import materijali001 from './NavBarStranice/materijali001';
const routing = (
<Router>
<div>
<Route exact path="/" component={App} />
<Route path="/predmet" component={StranicaPredmeta} />
<Route path="/fox" component={App} />
<Route path="/FOX/StranicaPredmeta" component={StranicaPredmeta} />
<Route path="/student" component={student001} />
<Route path="/unos_podataka" component={unos_podataka001} />
<Route path="/ispiti" component={ispiti001} />
Expand Down