diff --git a/__tests__/index.android.js b/__tests__/index.android.js deleted file mode 100644 index abccf29..0000000 --- a/__tests__/index.android.js +++ /dev/null @@ -1,13 +0,0 @@ -import 'react-native'; -import React from 'react'; -import App from '../index.android.js'; - -// Note: test renderer must be required after react-native. -import renderer from 'react-test-renderer'; -import 'isomorphic-fetch'; - -it('renders correctly', () => { - const tree = renderer.create( - - ); -}); diff --git a/__tests__/index.ios.js b/__tests__/index.js similarity index 88% rename from __tests__/index.ios.js rename to __tests__/index.js index 0b3ea3b..efc5d0b 100644 --- a/__tests__/index.ios.js +++ b/__tests__/index.js @@ -1,6 +1,6 @@ import 'react-native'; import React from 'react'; -import App from '../index.ios.js'; +import App from '../src/App'; // Note: test renderer must be required after react-native. import renderer from 'react-test-renderer'; diff --git a/android/app/BUCK b/android/app/BUCK index 5c3371f..e5685c2 100644 --- a/android/app/BUCK +++ b/android/app/BUCK @@ -45,12 +45,12 @@ android_library( android_build_config( name = "build_config", - package = "com.dusken", + package = "no.neuf.chateau", ) android_resource( name = "res", - package = "com.dusken", + package = "no.neuf.chateau", res = "src/main/res", ) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ef6ae0a..4242186 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf new file mode 100644 index 0000000..1c8f5e9 Binary files /dev/null and b/android/app/src/main/assets/fonts/Entypo.ttf differ diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf new file mode 100644 index 0000000..b270f98 Binary files /dev/null and b/android/app/src/main/assets/fonts/EvilIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/android/app/src/main/assets/fonts/FontAwesome.ttf differ diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf new file mode 100644 index 0000000..6cce217 Binary files /dev/null and b/android/app/src/main/assets/fonts/Foundation.ttf differ diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf new file mode 100644 index 0000000..307ad88 Binary files /dev/null and b/android/app/src/main/assets/fonts/Ionicons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf new file mode 100644 index 0000000..7015564 Binary files /dev/null and b/android/app/src/main/assets/fonts/MaterialIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf new file mode 100644 index 0000000..ff0dda1 Binary files /dev/null and b/android/app/src/main/assets/fonts/Octicons.ttf differ diff --git a/android/app/src/main/assets/fonts/Roboto.ttf b/android/app/src/main/assets/fonts/Roboto.ttf new file mode 100644 index 0000000..3e6e2e7 Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto.ttf differ diff --git a/android/app/src/main/assets/fonts/Roboto_medium.ttf b/android/app/src/main/assets/fonts/Roboto_medium.ttf new file mode 100644 index 0000000..aa00de0 Binary files /dev/null and b/android/app/src/main/assets/fonts/Roboto_medium.ttf differ diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf new file mode 100755 index 0000000..6ecb686 Binary files /dev/null and b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf new file mode 100644 index 0000000..e4ae46c Binary files /dev/null and b/android/app/src/main/assets/fonts/Zocial.ttf differ diff --git a/android/app/src/main/assets/fonts/rubicon-icon-font.ttf b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf new file mode 100755 index 0000000..25e7d92 Binary files /dev/null and b/android/app/src/main/assets/fonts/rubicon-icon-font.ttf differ diff --git a/android/app/src/main/java/com/dusken/MainActivity.java b/android/app/src/main/java/no/neuf/chateau/MainActivity.java similarity index 93% rename from android/app/src/main/java/com/dusken/MainActivity.java rename to android/app/src/main/java/no/neuf/chateau/MainActivity.java index 35f1464..0d548ee 100644 --- a/android/app/src/main/java/com/dusken/MainActivity.java +++ b/android/app/src/main/java/no/neuf/chateau/MainActivity.java @@ -1,4 +1,4 @@ -package com.dusken; +package no.neuf.chateau; import com.facebook.react.ReactActivity; diff --git a/android/app/src/main/java/com/dusken/MainApplication.java b/android/app/src/main/java/no/neuf/chateau/MainApplication.java similarity index 97% rename from android/app/src/main/java/com/dusken/MainApplication.java rename to android/app/src/main/java/no/neuf/chateau/MainApplication.java index 84b8bc6..02e3539 100644 --- a/android/app/src/main/java/com/dusken/MainApplication.java +++ b/android/app/src/main/java/no/neuf/chateau/MainApplication.java @@ -1,4 +1,4 @@ -package com.dusken; +package no.neuf.chateau; import android.app.Application; diff --git a/index.android.js b/index.android.js index 0576fff..7bedd44 100644 --- a/index.android.js +++ b/index.android.js @@ -1,19 +1,3 @@ -import DuskenContainer from "./src/DuskenContainer"; -import {AppRegistry} from "react-native"; -import React, {Component} from 'react'; -import { Provider } from 'react-redux'; -import { createStore } from 'redux' -import duskenApp from "./src/reducers"; - -let store = createStore(duskenApp); - -export default class App extends Component { - render() { - return ( - - - - ) - } -} -AppRegistry.registerComponent('Dusken', () => App); +import App from './src/App'; +import { AppRegistry } from "react-native"; +AppRegistry.registerComponent('Dusken', () => App); \ No newline at end of file diff --git a/index.ios.js b/index.ios.js index 0576fff..7bedd44 100644 --- a/index.ios.js +++ b/index.ios.js @@ -1,19 +1,3 @@ -import DuskenContainer from "./src/DuskenContainer"; -import {AppRegistry} from "react-native"; -import React, {Component} from 'react'; -import { Provider } from 'react-redux'; -import { createStore } from 'redux' -import duskenApp from "./src/reducers"; - -let store = createStore(duskenApp); - -export default class App extends Component { - render() { - return ( - - - - ) - } -} -AppRegistry.registerComponent('Dusken', () => App); +import App from './src/App'; +import { AppRegistry } from "react-native"; +AppRegistry.registerComponent('Dusken', () => App); \ No newline at end of file diff --git a/ios/Dusken.xcodeproj/project.pbxproj b/ios/Dusken.xcodeproj/project.pbxproj index d6e13b6..ca07052 100644 --- a/ios/Dusken.xcodeproj/project.pbxproj +++ b/ios/Dusken.xcodeproj/project.pbxproj @@ -35,6 +35,18 @@ 2DCD954D1E0B4F2C00145EB5 /* DuskenTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* DuskenTests.m */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + BC4320B37397434C9FD88090 /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 12CD67F85B7649F48CC37FBF /* Entypo.ttf */; }; + 3E46ED82B1574BB598025413 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0A6DA7DAB38A43E2BF0FC37C /* EvilIcons.ttf */; }; + C867C6D3ECB7499FA2F051D6 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E926661F17B94D69B50A0BA5 /* FontAwesome.ttf */; }; + CC801D520E86402F9AF28660 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 390970DBF0FD44B0B4C8E2F0 /* Foundation.ttf */; }; + 29EC0E05561A4FB990648C33 /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 59C3A3AC725E4DF083440735 /* Ionicons.ttf */; }; + 48652E97B0B04C15B3FA6FC3 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D7A0431FBA3840039633FC3C /* MaterialIcons.ttf */; }; + BDDF26DE3FAA43BCA790809A /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C559033577D34FACA86020C1 /* Octicons.ttf */; }; + A8095F35E44E450894456405 /* Roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8CAEF677B8A643969E0294B7 /* Roboto_medium.ttf */; }; + 3A4E389007344A43A8BDB119 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D4F0955EA08E41F69EEE0DED /* Roboto.ttf */; }; + BFEDB977D7AA4DF1B645A99F /* rubicon-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8509F756B1F0438A97C346F1 /* rubicon-icon-font.ttf */; }; + 4306CBFD81DE4035B0AB4D30 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C02D46B0229941F69264474C /* SimpleLineIcons.ttf */; }; + 551E4CC640DB4E68A88730B5 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 4A651C47D6FC4ED2BAB4F197 /* Zocial.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -254,6 +266,18 @@ 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; + 12CD67F85B7649F48CC37FBF /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/native-base/Fonts/Entypo.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 0A6DA7DAB38A43E2BF0FC37C /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/native-base/Fonts/EvilIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + E926661F17B94D69B50A0BA5 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/native-base/Fonts/FontAwesome.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 390970DBF0FD44B0B4C8E2F0 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/native-base/Fonts/Foundation.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 59C3A3AC725E4DF083440735 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/native-base/Fonts/Ionicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + D7A0431FBA3840039633FC3C /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/native-base/Fonts/MaterialIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C559033577D34FACA86020C1 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/native-base/Fonts/Octicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 8CAEF677B8A643969E0294B7 /* Roboto_medium.ttf */ = {isa = PBXFileReference; name = "Roboto_medium.ttf"; path = "../node_modules/native-base/Fonts/Roboto_medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + D4F0955EA08E41F69EEE0DED /* Roboto.ttf */ = {isa = PBXFileReference; name = "Roboto.ttf"; path = "../node_modules/native-base/Fonts/Roboto.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 8509F756B1F0438A97C346F1 /* rubicon-icon-font.ttf */ = {isa = PBXFileReference; name = "rubicon-icon-font.ttf"; path = "../node_modules/native-base/Fonts/rubicon-icon-font.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C02D46B0229941F69264474C /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/native-base/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 4A651C47D6FC4ED2BAB4F197 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/native-base/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -466,6 +490,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* DuskenTests */, 83CBBA001A601CBA00E9B192 /* Products */, + 95AA103233A74A28A47B99B8 /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -482,6 +507,26 @@ name = Products; sourceTree = ""; }; + 95AA103233A74A28A47B99B8 /* Resources */ = { + isa = "PBXGroup"; + children = ( + 12CD67F85B7649F48CC37FBF /* Entypo.ttf */, + 0A6DA7DAB38A43E2BF0FC37C /* EvilIcons.ttf */, + E926661F17B94D69B50A0BA5 /* FontAwesome.ttf */, + 390970DBF0FD44B0B4C8E2F0 /* Foundation.ttf */, + 59C3A3AC725E4DF083440735 /* Ionicons.ttf */, + D7A0431FBA3840039633FC3C /* MaterialIcons.ttf */, + C559033577D34FACA86020C1 /* Octicons.ttf */, + 8CAEF677B8A643969E0294B7 /* Roboto_medium.ttf */, + D4F0955EA08E41F69EEE0DED /* Roboto.ttf */, + 8509F756B1F0438A97C346F1 /* rubicon-icon-font.ttf */, + C02D46B0229941F69264474C /* SimpleLineIcons.ttf */, + 4A651C47D6FC4ED2BAB4F197 /* Zocial.ttf */, + ); + name = Resources; + sourceTree = ""; + path = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -840,6 +885,18 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + BC4320B37397434C9FD88090 /* Entypo.ttf in Resources */, + 3E46ED82B1574BB598025413 /* EvilIcons.ttf in Resources */, + C867C6D3ECB7499FA2F051D6 /* FontAwesome.ttf in Resources */, + CC801D520E86402F9AF28660 /* Foundation.ttf in Resources */, + 29EC0E05561A4FB990648C33 /* Ionicons.ttf in Resources */, + 48652E97B0B04C15B3FA6FC3 /* MaterialIcons.ttf in Resources */, + BDDF26DE3FAA43BCA790809A /* Octicons.ttf in Resources */, + A8095F35E44E450894456405 /* Roboto_medium.ttf in Resources */, + 3A4E389007344A43A8BDB119 /* Roboto.ttf in Resources */, + BFEDB977D7AA4DF1B645A99F /* rubicon-icon-font.ttf in Resources */, + 4306CBFD81DE4035B0AB4D30 /* SimpleLineIcons.ttf in Resources */, + 551E4CC640DB4E68A88730B5 /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/Dusken/Info.plist b/ios/Dusken/Info.plist index 013c2d6..8c5ebf9 100644 --- a/ios/Dusken/Info.plist +++ b/ios/Dusken/Info.plist @@ -39,9 +39,8 @@ UIViewControllerBasedStatusBarAppearance NSLocationWhenInUseUsageDescription - + NSAppTransportSecurity - NSExceptionDomains @@ -52,5 +51,20 @@ + UIAppFonts + + Entypo.ttf + EvilIcons.ttf + FontAwesome.ttf + Foundation.ttf + Ionicons.ttf + MaterialIcons.ttf + Octicons.ttf + Roboto_medium.ttf + Roboto.ttf + rubicon-icon-font.ttf + SimpleLineIcons.ttf + Zocial.ttf + diff --git a/package.json b/package.json index ccc6e6d..d71e22d 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,11 @@ }, "dependencies": { "moment": "^2.18.1", + "native-base": "^2.3.0", "prop-types": "^15.5.10", "react": "16.0.0-alpha.12", "react-native": "0.46.3", + "react-navigation": "^1.0.0-beta.11", "react-redux": "^5.0.5", "redux": "^3.7.2" }, @@ -23,7 +25,7 @@ "jest": { "preset": "react-native", "transformIgnorePatterns": [ - "node_modules/(?!react-native|tcomb-form-native|apsl-react-native-button,react-native-device-info|react-clone-referenced-element)" + "node_modules/(?!react-native|react-navigation)" ] } } diff --git a/src/App.js b/src/App.js new file mode 100644 index 0000000..a629875 --- /dev/null +++ b/src/App.js @@ -0,0 +1,18 @@ +import Dusken from "./Dusken"; +import React, {Component} from 'react'; +import { Provider } from 'react-redux'; +import { createStore } from 'redux' +import duskenApp from "./reducers"; + +let store = createStore(duskenApp); + + +export default class App extends Component { + render() { + return ( + + + + ) + } +} diff --git a/src/Dusken.js b/src/Dusken.js index 19cec12..da3bbe1 100644 --- a/src/Dusken.js +++ b/src/Dusken.js @@ -1,12 +1,27 @@ -import React, { Component } from 'react'; -import LoginContainer from './modules/login/LoginContainer'; -import EventListContainer from "./modules/events/EventListContainer"; +import React from 'react'; +import {connect} from "react-redux"; +import {TabNavigator, StackNavigator} from "react-navigation"; -export default class Dusken extends Component { - render() { - // TODO: Navigation++ - return ( - - ) - } -} \ No newline at end of file +import EventsScreen from "./screens/EventScreen"; +import AboutScreen from "./screens/AboutScreen"; +import MembershipScreen from "./screens/MembershipScreen"; + + +const routeConfig = { + Events: { screen: EventsScreen }, + Membership: { screen: MembershipScreen }, + About: { screen: AboutScreen }, +}; + +const tabConfig = { + tabBarPosition: 'bottom' +}; + +/* Navigation */ +const tabNav = TabNavigator(routeConfig, tabConfig); + +const DuskenContainer = StackNavigator({ + Root: { screen: tabNav}, +}); + +export default connect()(DuskenContainer); \ No newline at end of file diff --git a/src/DuskenContainer.js b/src/DuskenContainer.js deleted file mode 100644 index d7816f0..0000000 --- a/src/DuskenContainer.js +++ /dev/null @@ -1,4 +0,0 @@ -import {connect} from "react-redux"; -import Dusken from "./Dusken"; - -export default connect()(Dusken); \ No newline at end of file diff --git a/src/modules/about/About.js b/src/modules/about/About.js new file mode 100644 index 0000000..ecac8fa --- /dev/null +++ b/src/modules/about/About.js @@ -0,0 +1,54 @@ +import React, { Component } from 'react'; +import {Text, ScrollView, View, Platform, StyleSheet, Image} from "react-native"; + +export default class About extends Component { + render() { + return ( + + + Chateau Neuf + + Studentene i Oslo har sitt naturlige tilholdssted på Det Norske Studentersamfund, i hyggelige lokaler på Chateau Neuf øverst på Majorstuen. Her er det åpent alle dager unntatt søndag, og hver dag skjer det en rekke ting i våre mange arrangementslokaler. Enten man ønsker en tur i baren, på kafé, på debatt, på konsert, teater eller kino, har man muligheten på Chateau Neuf. + Chateau Neuf er et frivillig drevet studenthus. Studenter over alt i Oslo kan komme hit og få nyttig og spennende erfaring med å drive et av Oslos største kulturhus. Her kan du stå i bar, sette lys og lyd, jobbe med markedsføring, produsere konserter, bli kjent med hundrevis av bra mennesker og få minner for livet. + Alle studentforeninger i Oslo kan arrangere gratis på Chateau Neuf. Skal du arrangere en fest, sette en konsert, holde et foredrag eller gjennomføre et møte, har vi lokaler som kan brukes til dette. + + + ) + } +} + + +const styles = StyleSheet.create({ + header: { + fontSize: 16, + fontWeight: 'bold', + color: '#000', + }, + paragraph: { + fontSize: 16, + color: '#000', + paddingBottom: 10, + lineHeight: 25, + }, + card: { + borderColor: '#e1e8ee', + borderWidth: 1, + ...Platform.select({ + ios: { + shadowColor: 'rgba(0,0,0, .2)', + shadowOffset: {height: 0, width: 0}, + shadowOpacity: 1, + shadowRadius: 1, + }, + android: { + elevation: 1, + }, + }), + padding: 8, + margin: 8, + backgroundColor: '#fff', + }, + featuredImage: { + height: 230, + } +}); \ No newline at end of file diff --git a/src/modules/about/AboutContainer.js b/src/modules/about/AboutContainer.js new file mode 100644 index 0000000..6e416ad --- /dev/null +++ b/src/modules/about/AboutContainer.js @@ -0,0 +1,5 @@ +import {connect} from "react-redux"; + +import About from "./About"; + +export default connect()(About); \ No newline at end of file diff --git a/src/modules/events/EventList.js b/src/modules/events/EventList.js index cf9be89..f67d593 100644 --- a/src/modules/events/EventList.js +++ b/src/modules/events/EventList.js @@ -43,15 +43,15 @@ export default class EventList extends Component { const styles = StyleSheet.create({ listItem: { - height: 100, + height: 86, }, listItemTitle: { - fontSize: 18, + fontSize: 16, fontWeight: 'bold', color: 'black' }, listItemTime: { - fontSize: 18, + fontSize: 16, color: 'black' }, container: { diff --git a/src/modules/membership/Membership.js b/src/modules/membership/Membership.js new file mode 100644 index 0000000..366fd8e --- /dev/null +++ b/src/modules/membership/Membership.js @@ -0,0 +1,62 @@ +import React, {Component} from 'react'; +import {ScrollView, Text, View, Linking, StyleSheet, Platform, Button} from "react-native"; + +export default class Membership extends Component { + render() { + return ( + + + Siden 1813 har Det Norske Studentersamfund samlet studenter til kulturell, politisk, faglig og ikke minst sosial aktivitet. Som medlem i DNS er du med på å understreke viktigheten til en felles møteplass for alle Oslos studenter, uavhengig av utdanningsinstitusjon, studie og hvem de er. + Vi setter pris på felleskapet som er med på å bygge Chateau Neuf. DNS er en organisasjon av og for medlemmene. Derfor sørger vi for at det blir litt lettere å være student ved å ta en del av kaka for medlemmene våre. Med medlemskap får billigere inngang og servering på alt som skjer på Chateau Neuf. + + +