Skip to content

Commit

Permalink
Merge branch 'home-ui-#3'
Browse files Browse the repository at this point in the history
  • Loading branch information
GoelBiju committed Dec 28, 2022
2 parents f7dd560 + 8a5b536 commit e4d7ae8
Show file tree
Hide file tree
Showing 20 changed files with 14,398 additions and 7,130 deletions.
4 changes: 0 additions & 4 deletions .expo-shared/assets.json

This file was deleted.

14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
**Description:**

Add a description

**Acceptance criteria:**

- [ ] Checklist of the criteria needed to complete this user story.
**Description:**

Add a description

**Acceptance criteria:**

- [ ] Checklist of the criteria needed to complete this user story.
26 changes: 13 additions & 13 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
## Description

Description of changes made

## Testing instructions

Testing instructions for code

- [ ] Review code

## Issues to close

Closes #{issue number}
## Description

Description of changes made

## Testing instructions

Testing instructions for code

- [ ] Review code

## Issues to close

Closes #{issue number}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ web-build/

# macOS
.DS_Store

config.json
126 changes: 63 additions & 63 deletions App.js
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
import Ionicons from "@expo/vector-icons/Ionicons";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { NavigationContainer } from "@react-navigation/native";
import React from "react";
import { Image, StatusBar, View } from "react-native";
import HomeScreen from "./screens/HomeScreen";
import MoreScreen from "./screens/MoreScreen";
import NewsScreen from "./screens/NewsScreen";
import SearchScreen from "./screens/SearchScreen";

const Tab = createBottomTabNavigator();

export default function App() {
return (
<NavigationContainer>
{/* Move to NavBar/Header component */}
<StatusBar style="light" />
<View
style={{
backgroundColor: "black",
alignItems: "center",
// justifyContent: "center",
}}
>
<Image source={require("./img/logo.png")} />
</View>

<Tab.Navigator
screenOptions={({ route }) => ({
tabBarIcon: ({ focused, color, size }) => {
let iconName;

// Customise navigation icons
if (route.name === "Home") {
iconName = focused ? "ios-home" : "ios-home-outline";
} else if (route.name === "Search") {
iconName = focused ? "ios-search" : "ios-search-outline";
} else if (route.name === "News") {
iconName = focused ? "ios-newspaper" : "ios-newspaper-outline";
} else if (route.name === "More") {
iconName = focused ? "ios-list" : "ios-list-outline";
}

return <Ionicons name={iconName} size={size} color={color} />;
},
})}
// Customise colours
tabBarOptions={{
activeTintColor: "white",
inactiveTintColor: "grey",
style: {
backgroundColor: "black",
},
}}
>
<Tab.Screen name="Home" component={HomeScreen} />
<Tab.Screen name="Search" component={SearchScreen} />
<Tab.Screen name="News" component={NewsScreen} />
<Tab.Screen name="More" component={MoreScreen} />
</Tab.Navigator>
</NavigationContainer>
);
}
import Ionicons from "@expo/vector-icons/Ionicons";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import { NavigationContainer } from "@react-navigation/native";
import React from "react";
import { Image, StatusBar, View } from "react-native";
import HomeScreen from "./screens/HomeScreen";
import MoreScreen from "./screens/MoreScreen";
import NewsScreen from "./screens/NewsScreen";
import SearchScreen from "./screens/SearchScreen";

const Tab = createBottomTabNavigator();

export default function App() {
return (
<NavigationContainer>
{/* Move to NavBar/Header component */}
<StatusBar style="light" />
<View
style={{
backgroundColor: "black",
alignItems: "center",
// justifyContent: "center",
}}
>
<Image source={require("./img/logo.png")} />
</View>

<Tab.Navigator
screenOptions={({ route }) => ({
tabBarIcon: ({ focused, color, size }) => {
let iconName;

// Customise navigation icons
if (route.name === "Home") {
iconName = focused ? "ios-home" : "ios-home-outline";
} else if (route.name === "Search") {
iconName = focused ? "ios-search" : "ios-search-outline";
} else if (route.name === "News") {
iconName = focused ? "ios-newspaper" : "ios-newspaper-outline";
} else if (route.name === "More") {
iconName = focused ? "ios-list" : "ios-list-outline";
}

return <Ionicons name={iconName} size={size} color={color} />;
},
})}
// Customise colours
tabBarOptions={{
activeTintColor: "white",
inactiveTintColor: "grey",
style: {
backgroundColor: "black",
},
}}
>
<Tab.Screen name="Home" component={HomeScreen} />
<Tab.Screen name="Search" component={SearchScreen} />
<Tab.Screen name="News" component={NewsScreen} />
<Tab.Screen name="More" component={MoreScreen} />
</Tab.Navigator>
</NavigationContainer>
);
}
96 changes: 45 additions & 51 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,51 +1,45 @@
# Digital Library - Mobile

## Setup

Make sure to have [Node.js](https://nodejs.org/en/download/) installed before proceeding.

Install Yarn as your package manager if you have not already got it:

```
$ npm install --global yarn
```

Clone the repository and change into it:

```bash
$ git clone https://github.com/MJSSA/digital-library-mobile.git

$ cd digital-library-mobile
```

Install Expo globally:

```bash
$ yarn global add expo-cli
```

Install dependencies and start project:

```bash
$ yarn install

$ yarn start
```

Install [Expo](https://expo.io/) on Android or iOS to run the application from the QR code provided in the Expo browser.

## Resources

[React - Hello World](https://reactjs.org/docs/hello-world.html)

[React - Hooks](https://reactjs.org/docs/hooks-intro.html)

[React Native - Getting Started](https://reactnative.dev/docs/getting-started)

[React Native + Expo - Environment Setup](https://reactnative.dev/docs/environment-setup)

[React Native Express (Tutorial)](https://www.reactnative.express/)

[React - Context](https://reactjs.org/docs/context.html)

[React Navigation - Getting Started](https://reactnavigation.org/docs/getting-started)
# Digital Library - Mobile

## Setup

Make sure to have [Node.js](https://nodejs.org/en/download/) installed before proceeding.

Clone the repository and change into it:

```bash
$ git clone https://github.com/MJSSA/digital-library-mobile.git

$ cd digital-library-mobile
```

Install Expo globally:

```bash
$ npm global add expo-cli
```

Install dependencies and start project:

```bash
$ npm install

$ npm start
```

Install [Expo](https://expo.io/) on Android or iOS to run the application from the QR code provided in the Expo browser.

## Resources

[React - Hello World](https://reactjs.org/docs/hello-world.html)

[React - Hooks](https://reactjs.org/docs/hooks-intro.html)

[React Native - Getting Started](https://reactnative.dev/docs/getting-started)

[React Native + Expo - Environment Setup](https://reactnative.dev/docs/environment-setup)

[React Native Express (Tutorial)](https://www.reactnative.express/)

[React - Context](https://reactjs.org/docs/context.html)

[React Navigation - Getting Started](https://reactnavigation.org/docs/getting-started)
24 changes: 12 additions & 12 deletions layout/BottomMenu.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.page-footer {
background-color: #202225;
letter-spacing: 1.3px;
position: absolute;
width: 100%;
font-size: medium;
bottom: 0;
}

.row {
text-align: center;
}
.page-footer {
background-color: #202225;
letter-spacing: 1.3px;
position: absolute;
width: 100%;
font-size: medium;
bottom: 0;
}

.row {
text-align: center;
}
90 changes: 45 additions & 45 deletions layout/BottomMenu.js
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
import React, { Component } from "react";
// import { Link } from "react-router-dom";
import "./BottomMenu.css";

class BottomMenu extends Component {
render() {
return (
<footer className="page-footer">
<div className="container">
<div className="row">
<div className="col l s4">
<h5>Home</h5>
<ul>{/* <li><Link to="/">Home</Link></li> */}</ul>
</div>
<div className="col 4 s4">
<h5>Search</h5>
{/* <ul>
</ul> */}
</div>
<div className="col 8 s4">
<h5>News</h5>
{/* <ul>
<li><Link to="/contact">Contact Us</Link></li>
</ul> */}
</div>
<div className="col 8 s4">
<h5>Cast</h5>
{/* <ul>
<li><Link to="/contact">Contact Us</Link></li>
</ul> */}
</div>
<div className="col 8 s4">
<h5>More</h5>
{/* <ul>
<li><Link to="/contact">Contact Us</Link></li>
</ul> */}
</div>
</div>
</div>
</footer>
);
}
}

export default BottomMenu;
import React, { Component } from "react";
// import { Link } from "react-router-dom";
import "./BottomMenu.css";

class BottomMenu extends Component {
render() {
return (
<footer className="page-footer">
<div className="container">
<div className="row">
<div className="col l s4">
<h5>Home</h5>
<ul>{/* <li><Link to="/">Home</Link></li> */}</ul>
</div>
<div className="col 4 s4">
<h5>Search</h5>
{/* <ul>
</ul> */}
</div>
<div className="col 8 s4">
<h5>News</h5>
{/* <ul>
<li><Link to="/contact">Contact Us</Link></li>
</ul> */}
</div>
<div className="col 8 s4">
<h5>Cast</h5>
{/* <ul>
<li><Link to="/contact">Contact Us</Link></li>
</ul> */}
</div>
<div className="col 8 s4">
<h5>More</h5>
{/* <ul>
<li><Link to="/contact">Contact Us</Link></li>
</ul> */}
</div>
</div>
</div>
</footer>
);
}
}

export default BottomMenu;
Loading

0 comments on commit e4d7ae8

Please sign in to comment.